Adjust angular request
Merge conflict