VID-1854 fixing conflict