CRM-18517 add merge test for when conflict encountered