diff --git a/vim.spec b/vim.spec
index 6e4d8377..e8623b4c 100644
--- a/vim.spec
+++ b/vim.spec
@@ -127,7 +127,10 @@ Summary: A minimal version of the VIM editor
 # remove when a new RHEL is released (current 8)
 Conflicts: %{name}-common < %{epoch}:8.1.1-1
 Conflicts: vim-wrappers < 2:8.2.2488-2
+<<<<<<< HEAD
 Obsoletes: vim-wrappers < 2:8.2.2488-2
+=======
+>>>>>>> e019d047369c83a52d7c022b0ef58a474b3b9470
 Provides: vi
 Provides: %{_bindir}/vi
 Requires: vim-wrappers-compat = %{epoch}:%{version}-%{release}