Fixes incorrect merge conflict resolution.