better merge conflict resolution