merging
add rails steps