Added note on merging branches and flattening history