Add resolution thing to fix conflict in bower.