Rails 4 merge