diff --git a/pr-2164--01-merge-conflict.png b/pr-2164--01-merge-conflict.png
new file mode 100644
index 0000000000..8011f3f8bd
Binary files /dev/null and b/pr-2164--01-merge-conflict.png differ
diff --git a/pr-2164--02-merge-conflict-prepared.png b/pr-2164--02-merge-conflict-prepared.png
new file mode 100644
index 0000000000..e0189e249c
Binary files /dev/null and b/pr-2164--02-merge-conflict-prepared.png differ