2 files changed, 2 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 852d4c0..2e31ae0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -30,6 +30,7 @@ Alphabetical list of contributors:
 * hurcy <cinyoung.hur@gmail.com>
 * Ian Robertson <ian.robertson@capitalone.com>
 * JacekPliszka <Jacek.Pliszka@gmail.com>
+* Jean-Martin Archer <jm@jmartin.ca>
 * Jesús Leganés Combarro "Piranna" <piranna@gmail.com>
 * Johannes Hoff <johshoff@gmail.com>
 * John Bodley <john.bodley@airbnb.com>
diff --git a/CHANGELOG b/CHANGELOG
index 877434d..eb5c381 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ Development Version
 Enhancements
 
 * Add ELSIF as keyword (issue584).
+* Add CONFLICT and ON_ERROR_STOP keywords (pr595, by j-martin).
 
 Bug Fixes