Merge the conflict
[vuplus_openembedded] / opie-jumpx / opie-jumpx_1.1.7.oe