4 years after the original pull request was more or less denied because of "we'll do it as part of a bigger thing" the angular team asked the contributor if he is willing fix conflicts and merge again.

I think it's really the worst way you can handle open source contributions, and it actually typical of the angular team behavior.