git notes merge: Manual conflict resolution, part 1/2