maybe this will work *prays
Merge branch 'whatever'
Merge branch 'master' into whatever