Support eldoc
Fix conflicts