fixe merge in deploy