adds angular to main template
merge conflict