on the master
local master push to remote develop
Merge remote-tracking branch 'max_temp/develop'
local master push to remote develop again