final example merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	com.gps.git.test1/test/com/gps/git/test1/GitTest.java