git trouble
added new schema
dealing with merge
dealing with merge