add text in branch dev
dev1 add
master add
conflict fixed
fecture1 doing work
fecture2 doing work
merge with --no-ff