Resolve conflicts with angular version