UUID fix merge