re-remove ora message as part of merge conflict resolution

@e0d