commiting local changes preparing merge
commiting schema
merging