my vim files
right place for github vim theme
solving merging conflict