4th line
remove fourth line
print master branch
print master branch
before create a new branch
print test branch
this is marster branch
Merge branch 'test'

Conflicts:
	main.c
in master branch, for test
brach test, for test
resolve conflic
2 marst testing
space
space
Merge branch 'test'

Conflicts:
	main.c
just test
test rebase, add test.c
test rebase,add test1.c
after test rebase