corrects angular
adds missing files, and merges angular