copy and paste
clean up eventual consistency and replication
clean up conflict res doc