Resolving multiple versions of angular conflict [2/2]

refer to 650c65a155164e0731f4482a5ba6c95187cd6fd9
for the first part of this commit.