Conflicts: CHANGELOG.md VERSION.cmake src/gui/MacOSXBundleInfo.plist src/gui/folderstatusmodel.h src/gui/settingsdialog.cpp