equip layout, commit again