Branching, merging, and resolving conflicts - TechinUK