note about merging into master