Merge Upgrade angularjs