set https instead of git protocol and set filetype in vimrc
fix merge conflict