Conflicts: library/Billrun/Version.php public/globalSettings.js public/static/js/main.8cb1c7a5.chunk.js