diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index 0a21236ac0d6..10663e255c51 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -244,10 +244,10 @@ CFLAGS+=		${KERN_SSP_CFLAG}
 CFLAGS+=	-mretpoline
 .endif
 
-<<<<<<< HEAD
 .if !defined(TRIVIAL_VAR_AUTO_INIT_ZERO_SAFE)
 CFLAGS+=	-ftrivial-auto-var-init=uninitialized
-=======
+.endif
+
 #
 # Kernel Address SANitizer support
 #
@@ -328,21 +328,6 @@ SAN_CFLAGS+=	-fsanitize-coverage=trace-pc
 # Add the sanitizer C flags
 CFLAGS+=	${SAN_CFLAGS}
 
-#
-# Initialize stack variables on function entry
-#
-.if ${OPT_INIT_ALL} != "none"
-.if ${COMPILER_FEATURES:Minit-all}
-CFLAGS+= -ftrivial-auto-var-init=${OPT_INIT_ALL}
-.if ${OPT_INIT_ALL} == "zero" && ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 160000
-CFLAGS+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang
-.endif
-.else
-.warning INIT_ALL (${OPT_INIT_ALL}) requested but not supported by compiler
-.endif
->>>>>>> internal/freebsd/current/main
-.endif
-
 #
 # Some newer toolchains default to DWARF 5, which isn't supported by some build
 # tools yet.
diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile
index ce592f0f430e..4e23caf33da6 100644
--- a/sys/modules/vmm/Makefile
+++ b/sys/modules/vmm/Makefile
@@ -20,11 +20,8 @@ SRCS+=	vmm.c			\
 	vmm_stat.c
 
 .if ${MACHINE_CPUARCH} == "aarch64"
-<<<<<<< HEAD
 KERN_SSP_CFLAG=	-fstack-protector
-=======
 CFLAGS+= -I${SRCTOP}/sys/${MACHINE}/vmm/io
->>>>>>> internal/freebsd/current/main
 DPSRCS+=	assym.inc
 
 # TODO: Add the new EL2 code
@@ -79,13 +76,11 @@ DPSRCS+=	vmx_genassym.c svm_genassym.c offset.inc
 CFLAGS+= -I${SRCTOP}/sys/amd64/vmm/intel
 CFLAGS+= -I${SRCTOP}/sys/amd64/vmm/amd
 
-<<<<<<< HEAD
 TRIVIAL_VAR_AUTO_INIT_ZERO_SAFE=	yes
-=======
+
 SRCS+=	opt_acpi.h		\
 	opt_bhyve_snapshot.h	\
 	opt_ddb.h
->>>>>>> internal/freebsd/current/main
 
 SRCS+=	vmm_host.c	\
 	vmm_ioport.c	\