diff --git a/Earthfile b/Earthfile
index 2560175..1d9a594 100644
--- a/Earthfile
+++ b/Earthfile
@@ -9,7 +9,11 @@ ARG IMAGE_REPO=$OS_DISTRIBUTION
 ARG K8S_DISTRIBUTION
 ARG CUSTOM_TAG
 ARG ARCH
+<<<<<<< HEAD
 ARG PE_VERSION=v4.0.6
+=======
+ARG PE_VERSION=v4.1.0-alpha9
+>>>>>>> da91d45 (copy apparmor to /usr/bin and update provider/pe versions (#81))
 ARG SPECTRO_LUET_VERSION=v1.1.9
 ARG KAIROS_VERSION=v2.3.2
 ARG K3S_FLAVOR_TAG=k3s1
@@ -17,9 +21,15 @@ ARG RKE2_FLAVOR_TAG=rke2r1
 ARG BASE_IMAGE_URL=quay.io/kairos
 ARG OSBUILDER_VERSION=v0.7.11
 ARG OSBUILDER_IMAGE=quay.io/kairos/osbuilder-tools:$OSBUILDER_VERSION
+<<<<<<< HEAD
 ARG K3S_PROVIDER_VERSION=v4.1.0-alpha4
 ARG KUBEADM_PROVIDER_VERSION=v4.1.0-alpha7
 ARG RKE2_PROVIDER_VERSION=v4.1.0-alpha3
+=======
+ARG K3S_PROVIDER_VERSION=v4.1.0-alpha3
+ARG KUBEADM_PROVIDER_VERSION=v4.1.0-alpha6
+ARG RKE2_PROVIDER_VERSION=v4.1.0-alpha2
+>>>>>>> da91d45 (copy apparmor to /usr/bin and update provider/pe versions (#81))
 ARG FIPS_ENABLED=false
 ARG HTTP_PROXY
 ARG HTTPS_PROXY