merge design changes