# Conflicts: # app/Architecture/Providers/AppServiceProvider.php # app/Eloquent/Observers/YearPeriodObserver.php