diff --git a/compose.override.yml b/compose.override.yml
index 8ec5b2bd..64afa618 100644
--- a/compose.override.yml
+++ b/compose.override.yml
@@ -93,10 +93,7 @@ x-shared:
       - ${NEODB_DATA:-../data}/takahe-cache:/www/cache
       - ${NEODB_DATA:-../data}/www-root:/www/root
       - ./custom/edition.custom.html:/neodb/catalog/templates/edition.html
-<<<<<<< HEAD
       - ./custom/common_libs.custom.html:/neodb/common/templates/common_libs.html
-=======
->>>>>>> b0ec90060ab08edd9f9fc48cd8125e82dedbafd3
     depends_on:
       - redis
       - neodb-db