Fixes conflicts and adds USEC_OFFICER and Ozark as trial admin and moderator respectively.