UPDATE merge column, just to make sure it matches for UPDATE
Merge branch 'master' of github.com:petergeoghegan/upsert

Conflicts:
	benchinsert.sql