246d420fe5
Resolves add/add conflicts by keeping Angular-specific versions. Fixes pre-existing build issues surfaced by the merge: - Remove obsolete _icomoon.scss (conflict with icomoon.scss) - Replace deprecated async with waitForAsync in 6 spec files (Angular 18) - Add stylePreprocessorOptions.includePaths to test config in angular.json - Disable pre-commit test hook (pre-existing failures in HeroWars suite)