From a17b1527c81dfb54b78106415e8b4ffa929e9b22 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Thu, 9 Jun 2022 15:43:20 -0400
Subject: [PATCH] Fix conflicting files

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>