feat(vault): add personal vault conflict recovery#55

Mingholy wants to merge 2 commits into

mainMingholy/loopat:mainfrom

feat/ft-9-personal-vault-conflictMingholy/loopat:feat/ft-9-personal-vault-conflictCopy head branch name to clipboard