add 123 to first line
add one line in dev2 branch
add one line in feature1 branch
& simple
confict fixed
modify the test.txt in new dev branch
merge with no-ff
add in dev
Merge branch 'dev'
fix bug and just add ! in line 4
merged bug fix 101
123
Merge branch 'dev'