before marge
merge with angular
after merge
merge