pg_stat_statements and "IN" conditions

Applying: Allow query jumble to squash a list external parameters
Using index info to reconstruct a base tree...
M	contrib/pg_stat_statements/expected/squashing.out
M	contrib/pg_stat_statements/sql/squashing.sql
M	src/backend/nodes/queryjumblefuncs.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/nodes/queryjumblefuncs.c
CONFLICT (content): Merge conflict in src/backend/nodes/queryjumblefuncs.c
Auto-merging contrib/pg_stat_statements/sql/squashing.sql
CONFLICT (content): Merge conflict in contrib/pg_stat_statements/sql/squashing.sql
Auto-merging contrib/pg_stat_statements/expected/squashing.out
CONFLICT (content): Merge conflict in contrib/pg_stat_statements/expected/squashing.out
Patch failed at 0001 Allow query jumble to squash a list external parameters

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"