Fix merge conflict

Signed-off-by: Isaac Bennetch <[email protected]>

Author: ibennetch

CHANGELOG.md

@@ -61,11 +61,13 @@
 * Fix for error message with multiple CALL statements (#223)
 * Recognize the question mark character as a parameter (#242)
 
-# [4.7.2] - YYYY-MM-DD
+## [4.7.2] - 2021-02-05
+
 - Added check for quoted symbol to avoid parser error in case of keyword (#317)
 - Adjust PHP version constraint to not support PHP 8.0 on the 4.7 series (5.x series supports it)
 
 ## [4.7.1] - 2020-10-15
+
 * Fix array_key_exists warning when parsing a "DEFAULT FALSE" token (#299)
 
 ## [4.7.0] - 2020-10-08