Changed how the test creates a conflict to be resolved, due to validations a revision cannot be create with a nil body or a nil rev Id