merge 29 august