Merge with company's conf.
Add gitconfig file.