merging with angular