diff --git a/Changelog.md b/Changelog.md
index 11f063a4..be591d07 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,11 +1,16 @@
 # Change Log
 
+<<<<<<< HEAD
 ## 0.9.3 (RC3) 'The Thundering Herd'
 
 RC3 fixes the following issues in RC2:
 - Use the, now official, ASPA OID (#700)
 - Re-issue ASPA objects on key rolls (717)
 
+=======
+## 0.9.3 (RC2) 'The Thundering Herd'
+
+>>>>>>> main
 This release adds the following features and fixes:
 - Prevent a thundering herd of hosted CAs publishing at the same time (#692) 
 - Re-issue ROAs to ensure that short EE subject names are used (#700)