Cleaned up my mess :-)
Merge origin/master
revert commit