NXP-15749: fix bower conflicts resolution