Fix merge error in schema.rb