merge 69