Deleted conflicted files for project