diff --git a/subgraph.template.yaml b/subgraph.template.yaml
index df56df2..05286e9 100644
--- a/subgraph.template.yaml
+++ b/subgraph.template.yaml
@@ -3,10 +3,6 @@ description: Graph Network analytics subgraph
 repository: https://github.com/graphprotocol/graph-network-analytics-subgraph
 features:
   - fullTextSearch
-<<<<<<< HEAD
-  - ipfsOnEthereumContracts
-=======
->>>>>>> feat: FDS refactor
 schema:
   file: ./schema.graphql
 dataSources: