hover to focus
fixed merge conflicts