angular and rails merge