test the merge without fast forward
merge the dev without ff