Deleted leftover merge files