removed old unmerged file