Fixing unmerged file