upgrade 3.0 version merge