From 090a595c9925d10983aa092d6822f4fa1050bd73 Mon Sep 17 00:00:00 2001
From: spencerrlongg <spencer@spencerlong.com>
Date: Tue, 23 Jul 2024 17:34:17 -0500
Subject: [PATCH] conflict

---
 app/Helpers/Helper.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index 4540dcb164..85421027d1 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -920,14 +920,16 @@ class Helper
                     } else {
                         $required = false;
                     }
-                if (strpos($rule, 'required') === false) {
-                    return false;
                 } else {
-                    if (strpos($rule_name, 'required') === false) {
-                        $required = false;
-                } else {
-                        $required = true;
-                }
+                    if (strpos($rule, 'required') === false) {
+                        return false;
+                    } else {
+                        if (strpos($rule_name, 'required') === false) {
+                            $required = false;
+                        } else {
+                            $required = true;
+                        }
+                    }
                 }
             }
         }