fix conflicted file