Fixes the diff

qpid-proton.spec

@@ -31,22 +31,9 @@ BuildRequires:  pkgconfig
 BuildRequires:  doxygen
 BuildRequires:  libuuid-devel
 BuildRequires:  openssl-devel
-<<<<<<< HEAD
-BuildRequires:  cyrus-sasl-devel
-BuildRequires:  cyrus-sasl-plain
-BuildRequires:  cyrus-sasl-md5
-BuildRequires:  doxygen
-BuildRequires:  jsoncpp-devel
-BuildRequires:  python3-devel
-BuildRequires:  python3-build
-BuildRequires:  python3-cffi
-BuildRequires:  python3-pip
-BuildRequires:  python3-setuptools
-=======
 BuildRequires:  python3-devel
 BuildRequires:  python3-pip
 BuildRequires:  python3-rpm-macros
->>>>>>> parent of 055360c (Rebases 0.40.0)
 BuildRequires:  python3-sphinx
 BuildRequires:  python3-wheel
 BuildRequires:  glibc-headers