conflict tooltip
Merge branch 'Kevin'