revert conflicting changes (oops, should have done a pull first...)