merger for JELLY_BEAN.