Fix unmerged file