Added stuff about branches and merges