Merge models on development

Keep a blank line before and after `private`.