add merge
merge with no-ff
Here comes new file...
New developer arrived
bedi say hello to every one
Merge branch 'bedi' into dev
Merge branch 'dev'