Adding a little conversation
merge