I have learned to create and fix a conflict! In this tutorial we are learning to create and merge branches as well as including the untracked files into our local repo. We are going to create branches using the terminal.