update fenetre config
merge