Merge conflict fixing