[ENYO-12] fixing bad rebase