# Conflicts: # resources/views/settings/branding.blade.php # resources/views/settings/general.blade.php