added angular
fixing merge conflict