does flow works?
Merge branches 'develop' and 'master' into develop
Merge branches 'master' and 'develop'