csci321-git-practice-2 # csci321-git-practice-2 commit1 <<<<<<< HEAD b7commit1 commit2 <<<<<<< HEAD commit3 master b7commit3 b7 commit4