* Fixed unflagged merge conflict, fixes to invert oracle