merge non/spire master