[2.0] Fix conflict resolution

 - fix typo models/changes causing a TypeError
 - automatically publish Change models to REST API

/to @ritch please review

The goal of this patch is to fix the replication for my Saturday's talk. I think it should be possible to get the conflict resolution working even without a public Change model, but I don't have time to investigate that at the moment.