gitskills <<<<<<< HEAD or simple create a new branch and simple. feature1 <<<<<<< HEAD ok master ======= add merge dev