notes/_ARCHIVE/misc_notes/Conflict Fix.md

1. Open note vault directory in terminal
2. 'bash git merge -abort
3. 'bash git reset --hard origin/main
4. 'bash git pull