update bower.json and resolve conflict