old stand
solve conflicts
damn ng-repeat