merge 22 october