merged in subproject angular