Updated build and Angular version.
Fixed merge issue.