[PLAT-4903] merge conflict fixed