fix merge muckups