kukoba fix merge