hover and link cleanup
merge error