Angular 1.2.10
resolve conflict