div4 state option
fix merge conflict