commit from replication 1
commit and merge