adding conflict handling,
fix timestamp replication dates,
improve replication logging