fixed angular merge issue

![selfie-0](http://i.imgur.com/DrOmRff.png)