Merge remote-tracking branch 'origin/master'
Undid a commit on my local copy and its prevented me from pushing to remote