Fix revert commit

This removes the <<<<HEAD etc from the commit!