resolved conflicts

docker/statistics/Modules/Journals/Routes/web.php

@@ -0,0 +1,13 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+
+Route::group(['middleware' => ['auth', 'disablebackbutton', 'user-locale','subscription-tracking', 'password-expiry']], function () {
+    /* journals */
+    Route::get('journals', 'JournalController@index')->name('journals');
+    Route::post('journals_create', 'JournalController@save')->name('journals.create');
+    Route::any('journals_records', 'JournalController@records')->name('journals.records');
+    Route::any('journals_delete/{id}', 'JournalController@delete_journal')->name('journals.delete');
+
+    Route::any('check_if_journal_can_be_deleted', 'JournalController@check_if_journal_can_be_deleted');
+});