.
merging rails
2