Git conflict resolution