Add notes
Resolve conflict