fix changes after repos merge