create convo function
Merge changes