diff --git a/opam.pins b/opam.pins
index 7c7f47e27c07a3ba6472a42838ff617d4ec200b1..15d94cd4a1f8d99f6a8e7adab12e6e7a725d0d35 100644
--- a/opam.pins
+++ b/opam.pins
@@ -1,5 +1 @@
-<<<<<<< HEAD
 coq-iris https://gitlab.mpi-sws.org/FP/iris-coq f987ca782d1301d319cf6c4ba8e2ab449ebe903a
-=======
-coq-iris https://gitlab.mpi-sws.org/FP/iris-coq 56f0afb23dc761c9a822a505d6d7d2cc435b681b
->>>>>>> 937f5230a0c0c9ef3f3cd87330fc210a2ca7ab11