Git is a version control system. Git is free software. add <<<<<<< HEAD branch change ======= branch change >>>>>>> feature1