Took my first shot at merging branches here:
And as expected from the video, merging together the other branch based on the same initial caused conflicts:
Starting to look forward to putting more stuff up on repositories.
1 Like
Great job 
