add new line in dev branch
add new line in readme
Merge branch 'dev'
featrue modify
master add
s confi
add for noff test
noff test in feature
sole conflicts again
dev1
master1
dev master after
dev m1
master m1
dev m2
dev master noff2