the first txt to add and commit
I'm yanggh, this is the second commit about the testAdd.txt.
the command git command -a
version 0.004 this version test the conflict amoung the master and branch

I'll try to solove the conflicts amoung the master and branch.
version 0.005

This version in master, I modified the third line like the branch experimental, when merge conflicts occur.
branch modified testAdd.txt's third line to branch
master modified testAdd.txt's third line to "master"
Merge branch 'master' into experimental

Conflicts:
	testAdd.txt
test pull