diff --git a/cloud-init.changes b/cloud-init.changes
index 7a24dae..ac3baa7 100644
--- a/cloud-init.changes
+++ b/cloud-init.changes
@@ -180,7 +180,6 @@ Tue Jan 31 19:47:23 UTC 2023 - Robert Schweikert <rjschwei@suse.com>
   + Prefer NetworkManager of sysconfig when available
 
 -------------------------------------------------------------------
->>>>>>> ./cloud-init.changes.new
 Thu Dec 22 18:10:45 UTC 2022 - Robert Schweikert <rjschwei@suse.com>
 
 - Update to version 22.4
diff --git a/cloud-init.spec b/cloud-init.spec
index daf5604..6c80b15 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -53,7 +53,6 @@ BuildRequires:  python3-configobj >= 5.0.2
 BuildRequires:  python3-httpretty
 BuildRequires:  python3-jsonpatch
 BuildRequires:  python3-jsonschema
-BuildRequires:  python3-mock
 BuildRequires:  python3-netifaces
 BuildRequires:  python3-oauthlib
 BuildRequires:  python3-pytest