Add scheme for merge
Fixed conflict in schema.rb