Uploading rails
Fixed conflicts