Introduction to merging and branching in GitHub