Merge Switch & ori-code