[UnityYAMLMerge.exe - Error in merge tool]

Hello, trying to resolve conflicts and this error popped up. I'm currently using Unity 2020.3.25f1, so I went to C:\Users\myUser\AppData\Local\plastic4\client.conf and changed the path to:

<MergeToolData>
      <FileExtensions>.prefab;.unity</FileExtensions>
      <Tools>
        <string>"C:\Program Files\Unity\Hub\Editor\2020.3.25f1\Editor\Data\Tools\UnityYAMLMerge.exe" merge -p "@basefile" "@sourcefile" "@destinationfile" "@output"</string>
        <string>mergetool -b="@basefile" -bn="@basesymbolic" -bh="@basehash" -s="@sourcefile" -sn="@sourcesymbolic" -sh="@sourcehash" -d="@destinationfile" -dh="@destinationhash" -a -r="@output" -t="@filetype" -i="@comparationmethod" -e="@fileencoding" -m="@mergetype" -re="@resultencoding" --progress="@progress" --extrainfofile="@extrainfofile"</string>
      </Tools>
    </MergeToolData>

as @Gardenfiend Games suggested above and I'm still getting the same error. Is this path with my old Unity Version mentioned somewhere else where I should change it?

Thank you!

[Streaming assets keep showing up despite being private]

Hello,  as you can see bellow despite my streaming assets being in the ignore.conf and added and private items, they still get checked-in and take forever to upload.
Any suggestion would be much appreciated, thanks!