Resolving multiple versions of angular conflict