For ENG-5865, fix merge madness