Deleted the files that were involved in the merge