#This project will help me learn about git, and committing changes
#Now I'm trying out commit shortcuts.
#Just trying out branches
#Let's make a merge conflict as a test #This is another comment about merge confliction
#I resolved the merge manually as they were on the same line