redesign merge