# Conflicts:
#   .clang-format
#   .gitignore
#   .vscode/extensions.json
#   .vscode/tasks.json
#   client/client/lib/README
#   client/client/platformio.ini
#   client/client/src/main.cpp