// See https://github.com/angular-ui/bootstrap/issues/2659

formsAngular.directive('uiDate', function (){
  return {
    restrict: 'EAC',
    require: 'ngModel',
    link: function(scope, element, attr, controller) {
      //remove the default formatter from the input directive to prevent conflict
      controller.$formatters.shift();
    }
  }
});

@@ -81,14 +81,26 @@
 ve('
-uiDate
+datepickerPopupFix
 ', f

Rename the directive