model: fix merging.

ALL TESTS OK