Remove leftover merge files