Fix OmniGears merge