fixed CORS issue
fixed merge conflict