Merge conflict fix?