Module Assignment 1b: Git Branching & Conflicts