fix index
fix merge