Add undoing merges notes
Add ours/theirs option