Add angular resolution to fix bower conflict