add notes on merge to branch.md