adding dev branch to git config
merging in online