manually merging rails app with my FE