Merge Notes into Master