default rails setup
merge fix