Pre-merge with Angular project