diff --git a/.liborc.metadata b/.liborc.metadata
index 9a181b9..32b9d3f 100644
--- a/.liborc.metadata
+++ b/.liborc.metadata
@@ -1,5 +1 @@
-<<<<<<< HEAD
-2cc2dfe9dfb06bd02b825bad3195b40b72176acb  SOURCES/orc-1.7.4.tar.gz
-=======
 0852e289dc4c674853d4724e02e3dde574dbf047  SOURCES/orc-1.7.5.tar.gz
->>>>>>> origin/c9s-sig-storage-ceph-pacific