Remove junk left behind from merge conflict