diff --git a/src/Illuminate/Foundation/Console/stubs/exception-render-report.stub b/src/Illuminate/Foundation/Console/stubs/exception-render-report.stub
index 76ffbf5ba3c3..4d1070c2f687 100644
--- a/src/Illuminate/Foundation/Console/stubs/exception-render-report.stub
+++ b/src/Illuminate/Foundation/Console/stubs/exception-render-report.stub
@@ -9,11 +9,7 @@ class DummyClass extends Exception
     /**
      * Report the exception.
      *
-<<<<<<< HEAD
-     * @return bool|void
-=======
      * @return bool|null
->>>>>>> 6.x
      */
     public function report()
     {