csci321-git-practice-1 commit1 commit2 <<<<<<< HEAD b1commit3 commit3 commit4 <<<<<<< HEAD b2commit5 b2commit6 master b1 commit7 commit8 commit9