Fixed unresolved merge conflict in db/schema.rb