solved merge conflicts
correct changes
Merge branch 'master' of https://github.com/alexurdea/generator-angular
bumped version