[dss-merge-requests] Dev build failure

[oebuild at builder.localdomain]

>From ssh://git.digitalstrom.org:16022/dss-oe/dss-oe
   6f84011..7d1ad9d  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
	targets/fieldtest/rootfs/common.inc
Please, commit your changes or stash them before you can merge.
Aborting
Updating 6f84011..7d1ad9d
[Fri Sep 18 11:30:03 CEST 2020] Preparation for dev build failed