Resolve conflicts during merge using __entity_id__