adding fix for git flow
merge