ENYO-2788: Correct merge errors