Merge with omnirom