# Conflicts: # .github/changelog.sh # cmake/PackageDeb.cmake # src/network/network_client.cpp # src/settings_gui.cpp