Fixed conflict but with angular-ui