diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2ba0b9..18a2103 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 Version 4.0.0-dev
 -----------------
 
@@ -109,11 +110,20 @@ Version 4.0.0-alpha1 (2017-10-18)
   However, this is an internal class and should not be used directly.
 
 Version 3.1.5-dev
+=======
+Version 3.1.6-dev
+>>>>>>> 3.x
 -----------------
 
+Nothing yet.
+
+Version 3.1.5 (2018-02-28)
+--------------------------
+
 ### Fixed
 
 * Fixed duplicate comment assignment in switch statements. (#469)
+* Improve compatibility with PHP-Scoper. (#477)
 
 Version 3.1.4 (2018-01-25)
 --------------------------
diff --git a/lib/PhpParser/NodeAbstract.php b/lib/PhpParser/NodeAbstract.php
index 184e4e8..29d42b4 100644
--- a/lib/PhpParser/NodeAbstract.php
+++ b/lib/PhpParser/NodeAbstract.php
@@ -2,6 +2,8 @@
 
 namespace PhpParser;
 
+use PhpParser\Node;
+
 abstract class NodeAbstract implements Node, \JsonSerializable
 {
     protected $attributes;