hover height of caption is now even
fixed merge conflict