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