Git tutorial Using git is awesome This line of text is intended to create a merge conflict. It should not remain in the final version of this file!