[dss-merge-requests] Dev build failure

[oebuild at builder.localdomain]

>From ssh://git.digitalstrom.org:16022/dss-oe/dss-oe
   4c58b55..24c4c38  master     -> origin/master
 * [new branch]      MR_add_protoc_to_toolchain -> origin/MR_add_protoc_to_toolchain
 * [new branch]      MR_fw-uboot-default-env_missing -> origin/MR_fw-uboot-default-env_missing
error: The following untracked working tree files would be overwritten by merge:
	yocto/dS/meta-digitalstrom-devel/recipes-bsp/u-boot/u-boot-default-env.bb
Please move or remove them before you can merge.
Aborting
Updating 4c58b55..24c4c38
[Thu Jun  9 01:30:06 CEST 2022] Preparation for dev build failed