merge 2.0