commit 1 no fast forward
commit 2 no fast forward
Merge branch 'mary' into develop