update bower
update code
updating project
resolved conflicts
resolving conflicts