Redesign merge