adds angular ui router
merges conflicts