merge 1.2