switch layout
fix merged