hover effects YAY
fixing merge