diff --git a/.gear/tags/list b/.gear/tags/list
index 63179e6ef..103277409 100644
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1,5 +1 @@
-<<<<<<< HEAD
-506200cf8b5c8419ce97d16dc8c50f4634e21ebe b8681
-=======
-e43970099269b5b6da36b8977ad47697602e4e54 b8659
->>>>>>> 0591e57d
+506200cf8b5c8419ce97d16dc8c50f4634e21ebe b8681
\ No newline at end of file