bower updated
merged