fix item
merge