Merge from angular src