Not really sure
fixed schema.rb merge conflict