move case
fix merge