update bower due to merge error