diff --git a/README.md b/README.md
index e1d87eb1..bd807e68 100644
--- a/README.md
+++ b/README.md
@@ -43,11 +43,7 @@ This library does not mirror the versions of the wrapped **Dear ImGui**. The sem
 * Minor changes: Extensions in API. Typically done through small version increments of **Dear ImGui** and/or exposing further features in a compatible way.
 * Patch changes: Bug fixes - either in the wrapper or the wrapped **Dear ImGui**, given that the API & behaviour remains the same.
 
-<<<<<<< HEAD
 At the moment, this library uses version [1.85](https://github.com/ocornut/imgui/releases/tag/v1.85) of **Dear ImGui**.
-=======
-At the moment, this library uses version [1.84.2](https://github.com/ocornut/imgui/releases/tag/v1.84.2) of **Dear ImGui**.
->>>>>>> 2c7a7b42df7b23fd6f35fa65bdadea656107a3c9
 
 ## Examples
 A separate repository was created to host ported examples and reference implementations.