Merge "Update conversation string" into main