simple -> matching

Conflicts:

	.gitconfig