fix: reduce potential conflict duplicates#2996

alexanderadam wants to merge 2 commits intostandardnotes:mainstandardnotes/app:mainfrom

alexanderadam:fix/reduce-false-conflict-duplicatesalexanderadam/app:fix/reduce-false-conflict-duplicatesCopy head branch name to clipboard