rails running on mac
fixed conflict in schema.rb