angular merge in progress