ENG-6260 fix bad merge and whitespace