add rack_cors
merge conflicts