added notes on merging branches