fix merge debris