diff --git a/ATE/1. Action Task.md b/ATE/1. Action Task.md
index a7b08a3..c2fc1e7 100644
--- a/ATE/1. Action Task.md	
+++ b/ATE/1. Action Task.md	
@@ -1,8 +1,7 @@
-<<<<<<< HEAD
+
 ![[Pasted image 20260127182400.png]]
-=======
+
 #ATE #general
->>>>>>> origin/main
 
 #### Task:
 #task