JD ClientModel
fixed merges