Merge the conflict
[vuplus_openembedded] / opie-securityplugins / opie-securityplugin-blueping_1.1.7.oe