some more rails conflicts