Repaired conflicted files