diff --git a/CHANGELOG.md b/CHANGELOG.md
index 754b8c1..7bbebc8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+## v0.7.0 (2021-10-07)
+
+#### New Features
+
+* (completion): add completion scripts
+#### Docs
+
+* add intro readme for docs building
+* add shell completion information
+* update full doc url in readme
+* remove personal "you/I/me"
+* add full documentation site
+* update changelog for 0.6.0
+#### Others
+
+* fix separator testing issues
+
+Full set of changes: [`v0.6.0...v0.7.0`](https://git.admin.franklin.edu/tins/checkcert/compare/v0.6.0...v0.7.0)
+
 ## v0.6.0 (2021-10-04)
 
 #### New Features
diff --git a/checkcert/checkcert.py b/checkcert/checkcert.py
index 2146f20..8c67450 100644
--- a/checkcert/checkcert.py
+++ b/checkcert/checkcert.py
@@ -13,7 +13,7 @@ from cryptography.x509.oid import NameOID
 import idna
 
 
-__version__ = "0.7.0"
+__version__ = "0.7.1"
 
 HostInfo = namedtuple("HostInfo", ["cert", "hostname", "peername", "is_valid"])
 
diff --git a/pyproject.toml b/pyproject.toml
index bd39a89..3b1f1ec 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,10 @@
 [tool.poetry]
 name = "checkcert"
+<<<<<<< HEAD
 version = "0.7.0"
+=======
+version = "0.7.1"
+>>>>>>> main
 description = "CLI to check tls cert information and determine validity"
 authors = ["Alex Kelly <kellya@arachnitech.com>"]
 readme = "README.md"