For ENG-4277, fix mismerged line that breaks a test case