Removing bower_components folder
Resolving conflict