Just need to do this so it works
Try pulling instead
Merge remote-tracking branch 'public/master'
Merge branch 'master' into develop