fix merge migration BOS/SP