Spec to handle failed revert due to conflicting commits