ADEN-1054 fix conflict