add vimtags
fix some
fix conflict