fix discussion data
merge