[ANAYLZER-457] -- Fixed merge conflict