resolving merge conflict

amontanez24 · amontanez24 · commit e80ec6db2841 · 2023-02-23T14:25:34.000-08:00
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,13 @@
 # History
 
+## v0.7.1 - 2023-02-23
+
+This release fixes a bug that prevented the `CTGAN` model from being saved after sampling.
+
+### Bugs Fixed
+
+* Cannot save CTGANSynthesizer after sampling (TypeError) - Issue [#270](https://github.com/sdv-dev/CTGAN/issues/270) by @pvk-developer
+
 ## v0.7.0 - 2023-01-20
 
 This release adds support for python 3.10 and drops support for python 3.6. It also fixes a couple of the most common warnings that were surfacing.
