fix conflicted