# Conflicts: # app/proprietary/src/main/java/stirling/software/proprietary/security/CustomLogoutSuccessHandler.java # Conflicts: # frontend/src/proprietary/routes/AuthCallback.tsx # Conflicts: # app/core/src/main/java/stirling/software/SPDF/controller/api/SettingsController.java # app/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java