merge master with current develop branch to stay on the same base
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'