From 3f8cbc5e43d07985cf2a19535bb932d6cb75ac35 Mon Sep 17 00:00:00 2001
From: Adam Wathan <adam.wathan@gmail.com>
Date: Wed, 14 Oct 2020 15:24:48 -0400
Subject: [PATCH] Update changelog

---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 619527ef8..dbceec30b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-- Nothing!
+### Fixed
+
+- Merge plugins when merging config with preset ([#2561](https://github.com/tailwindlabs/tailwindcss/pulls/#2561)
+- Use `word-wrap` and `overflow-wrap` together, not one or the other since `word-wrap` is IE-only
 
 ## [1.9.1]