switch layout
repair merged doc for new layout