crud model merge bugfix