Updated bower
merge