[dss-merge-requests] Dev build failure

[oebuild at builder.localdomain]

>From ssh://git.digitalstrom.org:16022/dss-oe/dss-oe
   fc1a380..15b15cb  master     -> origin/master
error: The following untracked working tree files would be overwritten by merge:
	yocto/dS/meta-digitalstrom-devel/lib/polib.py
Please move or remove them before you can merge.
Aborting
Updating fc1a380..15b15cb
[Tue Oct 26 01:30:06 CEST 2021] Preparation for dev build failed