diff --git a/dedication.qmd b/dedication.qmd
index 9d58ec13..79c2ec2f 100644
--- a/dedication.qmd
+++ b/dedication.qmd
@@ -1,7 +1,3 @@
 # Dedication {.unnumbered}
 
-<<<<<<< HEAD
 _This book is a testament to the idea that, in the vast expanse of technology and innovation, it's not always the largest systems, but the smallest ones, that can change the world._
-=======
-This book is a testament to the idea that, in the vast expanse of technology and innovation, it's not always the largest systems, but the smallest ones, that can change the world.
->>>>>>> main