Solve conflicts in schema.rb