diff --git a/2018/schemes/hall-a.pdf b/2018/schemes/hall-a.pdf
index d1dfb86..5f647bb 100644
Binary files a/2018/schemes/hall-a.pdf and b/2018/schemes/hall-a.pdf differ
diff --git a/2018/schemes/hall-a.xml b/2018/schemes/hall-a.xml
index 6ad921e..8f4b8b2 100644
--- a/2018/schemes/hall-a.xml
+++ b/2018/schemes/hall-a.xml
@@ -1 +1 @@
-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
\ No newline at end of file
+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
\ No newline at end of file
diff --git a/2018/schemes/hall-b.pdf b/2018/schemes/hall-b.pdf
index f124e78..86146c7 100644
Binary files a/2018/schemes/hall-b.pdf and b/2018/schemes/hall-b.pdf differ
diff --git a/2018/schemes/hall-b.xml b/2018/schemes/hall-b.xml
index a295dbb..9fe8fe5 100644
--- a/2018/schemes/hall-b.xml
+++ b/2018/schemes/hall-b.xml
@@ -1 +1 @@
-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
\ No newline at end of file
+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
\ No newline at end of file