diff --git a/dev/bootstrap.sh b/dev/bootstrap.sh
index 2af38bb..c6b8417 100755
--- a/dev/bootstrap.sh
+++ b/dev/bootstrap.sh
@@ -5,6 +5,7 @@ set -o pipefail
 
 MANIFEST_BRANCH="${1:-main}"
 
+<<<<<<< HEAD
 YOCTO_GID="$((1 + $RANDOM % 1000))"
 YOCTO_UID="$((1 + $RANDOM % 1000))"
 YOCTO_USER="yocto"
@@ -14,7 +15,6 @@ YOCTO_WORKDIR="/opt/${YOCTO_USER}"
 [[ -d "$PWD"/sstate-cache ]] || mkdir "$PWD"/sstate-cache
 
 
-
 subgidSize=$(( $(podman info --format "{{ range .Host.IDMappings.GIDMap }}+{{.Size }}{{end }}" ) - 1 ))
 subuidSize=$(( $(podman info --format "{{ range .Host.IDMappings.UIDMap }}+{{.Size }}{{end }}" ) - 1 ))