Fix merge conflict removals