removing conflicted files to merge in new ones