merge OPT changes