adding 1
adding 1 2 3 as a single commit
some change
feature branch first commit
conflicts resolved
feature branch second commit
Merge branch 'dev'