removing stuff from a revert merge fail