detail conversion changed
merge