Rails and master branch content merged