fix merge mess