add bower
merge