Deleted files generated by merge that should not have been checked in.