first-repo my very first repo changhed and another change another change <<<<<<< HEAD Creating a conflict with the version at github Creating conflicts with the local version of this file. 2b0d17300a95d956419700eaaad4b98bd5ffabc9