diff --git a/11ty/definitions/colonialism.md b/11ty/definitions/colonialism.md
index 88064c77..6a5af1fe 100644
--- a/11ty/definitions/colonialism.md
+++ b/11ty/definitions/colonialism.md
@@ -4,11 +4,11 @@ slug: colonialism
 speech: noun
 excerpt: the act of enforcing one's political and ideological dominance in a country or region that is not of one's origin
 sub_terms:
-    - text: modern
+  - text: modern
     full_title: modern colonialism
-    - text: settler
+  - text: settler
     full_title: settler colonialism
-    - text: Western
+  - text: Western
     full_title: Western colonialism
 defined: true
 reading:
diff --git a/11ty/definitions/neo-colonialism.md b/11ty/definitions/neo-colonialism.md
index d6427462..0c17c429 100644
--- a/11ty/definitions/neo-colonialism.md
+++ b/11ty/definitions/neo-colonialism.md
@@ -3,7 +3,6 @@ title: neo-colonialism
 slug: neo-colonialism
 speech: noun
 excerpt: the continued influence of colonial era ideologies and practices in a country or region by former dependencies, generally enforced by its own government and/or citizens as a lingering effect of colonialism
-<<<<<<< HEAD
 skip_in_table_of_content: true
 defined: true
 reading:
@@ -22,25 +21,5 @@ Neo-colonialism is a modern and more pervasive form of imposing ideological and
 In most African nations that were colonised by the British empire, western countries' ideals are seen as civilized and the best representation of societal progress. Standards of living that are ancestral are often dismissed as uncivilised and unconventional, erasing what is often thousands of years of culture.
 
 Governments limiting freedom of speech and other civil liberties of their citizens. A recent manifestation of this is seen in the [2020 #EndSARS campaign in Nigeria](https://en.wikipedia.org/wiki/End_SARS).
-=======
-sub_terms:
-    - text: neo-
-    full_title: neo-colonialism
-    - text: modern
-    full_title: modern colonialism
-defined: true
-reading:
-    - text: neo-colonialim - internet encyclopedia of philosophy
-      href: https://iep.utm.edu/neocolon/
----
-
-the continued influence and impact of colonial-era ideologies and practices in a country or region by former dependencies, generally enforced by its own government and/or citizens as a lingering effect of [colonialism](/definitions/colonialism)
-
-### Note
-
-An extension of colonialism that appears in the 21st century is neo-colonialism - a more pervasive form of imposing ideological and economic dominance on a country after it has been declared independent from its colonizer. The stealth nature of neo-colonialism can be traced to treaties, agreements, and ideologies that have been imparted from the oppresors on the oppressed because of previous dependencies.
-
-For instance, in most African nations that were colonized by the British empire, western countries' ideals are seen as civilized and the best representation of societal progress. This erases and dismisses other ways of life, deeming them unconventional. Another form of neo-colonial influence can be seen in how governments limit the freedom of speech and other civil liberties of their citizens. A recent manifestation of this is seen in the [2020 End SARS campaign in Nigeria](https://en.wikipedia.org/wiki/End_SARS).
->>>>>>> added definition and references for neo-colonialism
 
 See also: [colonialism](/definitions/colonialism)