merge with design