merge 12