Remove autosetup merge from gitconfig
Remove duplicate apply section from gitconfig