resolved conflicts

docker/statistics/resources/views/general_settings/subscription_noti.blade.php

@@ -0,0 +1,11 @@
+@php use Streamline\Enums\Roles; @endphp
+
+{{-- alert notification --}}
+@if (Auth::user()->hasRole('Admin'))
+    @if(warning_duration())
+    <div class="{{ show_subscription_reminder_message('class')}} " style="margin-left: -25.5px; margin-bottom:0%; margin-right: -25.5px;">
+        <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+        <span style="font-weight:600;line-height: 22px;">{{ show_subscription_reminder_message()}}</span>
+    </div>
+    @endif
+@endif