Report question

Question: Merging git notes when there are merge conflicts in them