git is a distributed version control system
git is a free software distributed under the GPL
git has a mutable index called stage
git tracks changes.
<<<<<<< HEAD
creating a new branch is quick and simple.
=======
creating a new branch is quick and simple.
>>>>>>> feature1
add merge