add schema
resolve merge conflict with schema.rb