Fixed CORS after merge