diff --git a/.changeset/sixty-islands-develop.md b/.changeset/sixty-islands-develop.md
index 9fbe2b2edd..9eb36cc1a9 100644
--- a/.changeset/sixty-islands-develop.md
+++ b/.changeset/sixty-islands-develop.md
@@ -2,10 +2,5 @@
 '@backstage/plugin-scaffolder': minor
 ---
 
-<<<<<<< Updated upstream
-Added props to override default Scaffolder page `title`, `subtitle` and `pageTitleOverride`.
-=======
 Added props to override default Scaffolder page title, subtitle and pageTitleOverride.
-Routes like `rootRouteRef`, `selectedTemplateRouteRef`, `nextRouteRef`, `nextSelectedTemplateRouteRef` were made public and can be used in your app (e.g. in custom TemplateCard component)
-
-> > > > > > > Stashed changes
+Routes like `rootRouteRef`, `selectedTemplateRouteRef`, `nextRouteRef`, `nextSelectedTemplateRouteRef` were made public and can be used in your app (e.g. in custom TemplateCard component).