add hello 5
add new branch
add new master
conflict fixed
add new dev2
merge whith no-ff
bar
Merge branch 'dev2'
add ddd