bugfix incorrect conflict resolution