ng-show url
merge conflicts