fix merge but && aput works