try to fix the problem of merging conflict
and add id to 'omni'