diff --git a/Merge Conflicts.docx b/Merge Conflicts.docx new file mode 100644 index 0000000..796d86c Binary files /dev/null and b/Merge Conflicts.docx differ