rails 3/ rails 4 conflict fix