Merge redesign