CROSS-1333 : Fix resolved conflict error