Solve conflict in bower