OS specific gitconfigs
Resolve conflict