Merge the conflict
[vuplus_openembedded] / opie-dasher / opie-dasher_1.1.7.oe