merge new design