Fixing non-obvious merge conflict