fix talk data
merge conflict