diff --git a/.gitea/workflows/review.yaml b/.gitea/workflows/review.yaml
index 170eea1..bdff5b0 100644
--- a/.gitea/workflows/review.yaml
+++ b/.gitea/workflows/review.yaml
@@ -11,11 +11,6 @@ on:
 
 jobs:
 
-<<<<<<< HEAD
-
-
-=======
->>>>>>> 9e26667 ( test)
     runs-on: ubuntu-latest
 
     steps: