[dss-merge-requests] Dev build failure

[oebuild at builder.localdomain]

>From https://git.digitalstrom.org/dss-oe/dss-oe
   5a1d558..e211fba  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
	scripts/create-opkg-yocto-usb-update-image
Please, commit your changes or stash them before you can merge.
Aborting
Updating 5a1d558..e211fba
[Wed Apr 25 03:30:02 CEST 2018] Preparation for dev build failed