Rails 4
merge fix