Deleted some leftover merge files.