migration to rails 4.1
conflict fix