[OE-4643] merge conflict fix