Update gitconfig to not keep backups during merges