preliminary changes to angular
resolving merge conflict