Added angular framework
Fixed merge conflict