updating gitconfig
updating template
merged