Git is a distributed version control system.
Git is free software distributed under the GPL.(fixed)
Git has a mutable index called stage.
Git tracks changes of files.

This is a test for git push after first push operating.
<<<<<<< HEAD
Creating a new branch is quick and simple.
=======
Creating a new branch is quick AND simple.
>>>>>>> feature1

add merge

add merge agin