ng-view init
fixed merge conflict