first commit for rails BYOS
fix minor merge conflict