add some plugins
add alias to git config file
merge