rackup all set
ready to merge
fixed merge error?