Not sure why this isn't working
Merge branch 'master' into staging