larshoeppner
commented
1 year ago not entirely sure why this caused a conflict, I branched from main after pulling your latest changes - I think you can probably simply "take theirs" on those files, but lmk if you want me to redo it
gitignore MacOS files, add vscode workspace config, update install instructions, update package-lock to use v3