Fix model to work in MySql
Fix merge changeset handling.