Correct wrong resolution of merge conflict, fix test failures.