diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 02e952c9..0606c425 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,6 @@
 | Q               | A
 | --------------- | -----
-| Branch?         | 1.3 (security fixes), 1.4 (bug fixes, improvements), 1.5 (new features)
+| Branch?         | 1.4 (security fixes), 1.5 (bug fixes, improvements), 1.6 (new features)
 | Bug fix?        | no/yes
 | New feature?    | no/yes
 | Related tickets | fixes #X, partially #Y, mentioned in #Z
diff --git a/CONFLICTS.md b/CONFLICTS.md
new file mode 100644
index 00000000..ef9b7ec6
--- /dev/null
+++ b/CONFLICTS.md
@@ -0,0 +1,9 @@
+# CONFLICTS
+
+This document explains why certain conflicts were added to `composer.json` and
+references related issues.
+
+- `behat/mink-selenium2-driver:>=1.7.0`:
+
+  This version adds strict type to the `Behat\Mink\Driver\Selenium2Driver::visit($url)` method
+  which causes a fatal error because the method signature is no longer compatible with the parent class.
diff --git a/README.md b/README.md
index e962b17d..f8729391 100644
--- a/README.md
+++ b/README.md
@@ -134,9 +134,9 @@ Tagged services would be executed according to their priority (descending).
 
 ## Supported branches
 
-* `1.3` (v1.3.*) - security fixes
-* `1.4` (v1.4.*) - bug fixes, improvements
-* `1.5` (v1.5.*) - new features
+* `1.4` (v1.4.*) - security fixes
+* `1.5` (v1.5.*) - bug fixes, improvements
+* `1.6` (v1.6.*) - new features
 * `2.0` (v2.0.*) - new features, removing deprecations, BC breaks
 
 ## Security issues