work on xhr and angular
merge