track click on conversation
merge conflict