[dss-merge-requests] Dev build failure

[oebuild at builder.localdomain]

>From ssh://git.digitalstrom.org:16022/dss-oe/dss-oe
   a0dcd3d..d781d89  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
	targets/devel/rootfs/dss11-1gb-t1/conf/bblayers.conf
Please, commit your changes or stash them before you can merge.
Aborting
Updating a0dcd3d..d781d89
[Tue Sep  8 01:30:04 CEST 2020] Preparation for dev build failed