merged into rails