diff --git a/lib/octicons_react/README.md b/lib/octicons_react/README.md
index 2662fbab3..9ed7b548b 100644
--- a/lib/octicons_react/README.md
+++ b/lib/octicons_react/README.md
@@ -158,13 +158,6 @@ export default () => (
 )
 ```
 
-<<<<<<< HEAD
-
-> ⚠️ The `Octicon` component is deprecated. Use icon components on their own instead:
-
-=======
-
-> > > > > > > origin/main
 
 ```diff
 - <Octicon icon={AlertIcon} />