changing to angularjs
fixed merge