Updated diffing section
Updated branching and merging