Merge pull request #7919 from bensze01/dev/bensze01/merge-queue-test-2

Test PR for Github merge queues #2
diff --git a/merge_conflict.txt b/merge_conflict.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/merge_conflict.txt