ENG-4516 fix merge conflict compiler issue