Removed crappy value ingitconfig
Fixed bad merge
Trying to fix things