merge with maquette