conflict-resolution GitHUB This is text from GH <<<<<<< HEAD This is my text on my machine These are new changes. b03c643b64e866d7b7c0a0691dcb924222600d1a