bugfix in merge models
Merge master