fix rails 4 conflicts