Remove leftover merge gunk