add a new line
add a line
Merge branch 'feature1'

Conflicts:
	README
add
fix bug 101
merged  bugfix 101
1
2
ddMerge branch 'dev'

Conflicts:
	README