modify git03.txt and add test... content
change git03 add feature1 content
modify master git03
resolve conflict
testtest
resolve conflict
dev test
merge with no-ff
fix bug 01
merged bug fix bug1