Added CORS middleware and fixed cors issue
Fixed conflict