add easymotion
fix merge conflict