test to be sure
Merge branch 'master' of local repository into dev
changesin dev
after commit