fixed merge junk in schema.rb