fix conflict resolution