revert stupid git merge