Conflicts: bin/qmk lib/python/qmk/cli/__init__.py Merge conflicts fixed by skullydazed.
qmk format-json
DEFAULT_FOLDER
qmk doctor