remove confused part
merge