[CDE-139] - Bad merge