updated angular
fixed merge conflicts