diff --git a/bundles.rst b/bundles.rst
index c9f535b70d7..5bf4d501b14 100644
--- a/bundles.rst
+++ b/bundles.rst
@@ -151,7 +151,6 @@ As you move through the guides, you'll learn how to persist objects to a
 database, create and validate forms, create translations for your application,
 write tests and much more. Each of these has their own place and role within
 the bundle.
->>>>>>> 3.4
 
 Learn more
 ----------