Auto close the tip window
Fixing merge conflicts