merge conflict
restructure angularjs things