merge complete redesign