more conversation integrated
merge