Create and edit notes
Merge conflicts
fix merge