hover highlight book
merge conflicts solved