Git is a distributed version control system.
Git is free software.
<<<<<<< HEAD
create a new branch is quick and simple.

GIt has a mutable index called stage.
Git tracks changes.
Git tracks changes of files.
=======
create a new branch is quick.

Creating a new brach is quick.
>>>>>>> dev
<<<<<<< HEAD
Creating a new branch is quick and simple.
=======

Creating a new branch is quick AND simple.
>>>>>>> feature1
add merge