2.6.14

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8a2aef2..cede13b 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 *GarrisonCommander helps you when choosing the right follower for the right mission*

+* *2.6.14*
+Fix: Rare error when zoning in and out of Garrison
+Fix: In follower page, swap button conflicted with confirm upgrade button
+
 * *2.6.13*
 Fix: Message: Interface\AddOns\GarrisonCommander-Broker\ldb.lua:414: attempt to perform arithmetic on local 'r2' (a nil value) in GC-Broker
 Feature: In follower page, armor and weapon upgrades can be swapped
diff --git a/GarrisonCommander.toc b/GarrisonCommander.toc
index 8b862d3..ccaa1f7 100644
--- a/GarrisonCommander.toc
+++ b/GarrisonCommander.toc
@@ -13,7 +13,7 @@
 ## Notes-zhCN: 發送所有的追隨者與點擊多任務
 ## Author: Alar of Daggerspine
 ## Version: @project-version@ 6.2.0
-## X-Version: 2.6.13
+## X-Version: 2.6.14
 ## X-Revision: @project-abbreviated-hash@
 ## eMail: alar@aspide.it
 ## URL: http://wow.aspide.it