Fixes merge conflict pages.