Fixed merge conflict regression with T12485
Fixed merge conflict regression with T12485

https://phabricator.endlessm.com/T11724

endlessm/eos-knowledge-lib,endlessm/eos-knowledge-lib,endlessm/eos-knowledge-lib,endlessm/eos-knowledge-lib