add the angular
fix all the conflicts!