merge 05 nov