Deleted conflicted files.