diff --git a/database.md b/database.md
index eba3b50..1341a3a 100644
--- a/database.md
+++ b/database.md
@@ -3,9 +3,6 @@ layout: post
 title: Database
 ---
 
-<<<<<<< Updated upstream:database.md
-### [Governance Archaeology Database: v1.2](https://airtable.com/appvYlkHheYBuvDdR/shrPD4OrKdIMAfgwP)
-=======
 ## [Governance Archaeology Database: v1.2](https://airtable.com/appvYlkHheYBuvDdR/shrPD4OrKdIMAfgwP)
 
 ## Documentation
@@ -32,4 +29,3 @@ title: Database
     - 10,000,000+ 
     - Unknown
 - **Source:** Source material documenting community information.
->>>>>>> Stashed changes:documentation.md
diff --git a/index.md b/index.md
index 29daa18..359513b 100644
--- a/index.md
+++ b/index.md
@@ -2,16 +2,7 @@
 title: Governance Archaeology
 layout: post
 ---
-<<<<<<< Updated upstream
 
-Where will people today turn for inspiration as they develop governance systems for the present and future? 
-<br>
-<br>
-The dominant political practices in many parts of the world have been defined around a narrow set of Western concepts and traditions. But the legacies of human self-governance are much broader than that. 
-<br>
-<br>
-To expand our historical imagination and our repertoires for the future, *governance archaeology* is a strategy for co-producing a global commons of collective governance design. We hope to inspire institutional learning and experimentation, particularly in the face of rapid technological change and vexing global crises.
-=======
 <center>
 Explore collective governance practices across culture, history, and geography. 
 <br>
@@ -21,5 +12,3 @@ Explore collective governance practices across culture, history, and geography.
 <br>
 View the full database here: <a href="https://airtable.com/appvYlkHheYBuvDdR/shrPD4OrKdIMAfgwP">Governance Archaeology Database, v1.2</a>
 </center>
->>>>>>> Stashed changes
-