Fix unmerged file on previous merge