fix conflicted files