change angular conflict resolution

Trying to fix Travis CI build