fix error return
merge conflict