align dev to master for git flow adoption