Remove stray unmerged file