merge 5/2