Well, replication still works and the code now checks for conflicts and crap