diff --git a/quill_html_converter/pubspec.yaml b/quill_html_converter/pubspec.yaml
index 64ed45b93..2da08053e 100644
--- a/quill_html_converter/pubspec.yaml
+++ b/quill_html_converter/pubspec.yaml
@@ -1,13 +1,8 @@
 name: quill_html_converter
 description: A extension for flutter_quill package to add support for dealing with conversion to/from html
 version: 9.0.0-dev-11
-<<<<<<< HEAD:packages/quill_html_converter/pubspec.yaml
 homepage: https://github.com/singerdmx/flutter-quill/tree/master/packages/quill_html_converter/
 repository: https://github.com/singerdmx/flutter-quill/tree/master/packages/quill_html_converter/
-=======
-homepage: https://github.com/singerdmx/flutter-quill/tree/master/quill_html_converter/
-repository: https://github.com/singerdmx/flutter-quill/tree/master/quill_html_converter/
->>>>>>> upstream/master:quill_html_converter/pubspec.yaml
 issue_tracker: https://github.com/singerdmx/flutter-quill/issues/
 documentation: https://github.com/singerdmx/flutter-quill/tree/master/quill_html_converter/