fix(conflicts): prevent Keep Both from replacing existing files (#144) - #155

fix(conflicts): prevent Keep Both from replacing existing files (#144)#155

psimaker merged 2 commits into

mainpsimaker/vaultsync:mainfrom

fix/issue-144-keep-both-no-replacepsimaker/vaultsync:fix/issue-144-keep-both-no-replaceCopy head branch name to clipboard