ENG-6388 more merge conflict resolutions