saving slots
fix merge