2do fix merge