Fix Rails-Conflict