Maybe this will work better
Merge branch 'master' into staging