diff --git a/packages/Webkul/Core/src/Helpers/Laravel5Helper.php b/packages/Webkul/Core/src/Helpers/Laravel5Helper.php
index 6a6bda3ad..1a2666014 100644
--- a/packages/Webkul/Core/src/Helpers/Laravel5Helper.php
+++ b/packages/Webkul/Core/src/Helpers/Laravel5Helper.php
@@ -211,7 +211,6 @@ class Laravel5Helper extends Laravel5
     }
 
     /**
-     * <<<<<<< HEAD
      * Set all session with the given key and value in the array.
      *
      * @param array $keyValue