fixes issue with merge conflict

Author: rishabhpoddar

.github/PULL_REQUEST_TEMPLATE.md

@@ -30,6 +30,7 @@
     -   If no such branch exists, then create one from the latest released branch.
 -   [ ] If have added a new web framework, update the `supertokens_python/utils.py` file to include that in the `FRAMEWORKS` variable
 -   [ ] If added a new recipe that has a User type with extra info, then be sure to change the User type in supertokens_python/types.py
+-   [ ] Make sure that `syncio` / `asyncio` functions are consistent.
 
 ## Remaining TODOs for this PR
 

CHANGELOG.md

@@ -5,8 +5,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## unreleased
 
+## [0.13.0] - 2023-05-04
 ### Breaking changes
 
 - Added support for CDI version `2.21`
@@ -48,6 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -   Refactored how access token validation is done
 -   Removed the handshake call to improve start-up times
 -   Added support for new access token version
+- added optional password policy check in `update_email_or_password`
 
 ### Added
 
@@ -363,13 +364,6 @@ session.init(
 ```
 
 
-
-
-
-## [0.13.0] - 2023-05-03
-
-- added optional password policy check in `update_email_or_password`
-
 ## [0.12.9] - 2023-04-28
 
 - Added missing arguments in `get_users_newest_first` and `get_users_oldest_first`

coreDriverInterfaceSupported.json

@@ -1,17 +1,6 @@
 {
   "_comment": "contains a list of core-driver interfaces branch names that this core supports",
   "versions": [
-    "2.9",
-    "2.10",
-    "2.11",
-    "2.12",
-    "2.13",
-    "2.14",
-    "2.15",
-    "2.16",
-    "2.17",
-    "2.18",
-    "2.19",
-    "2.20"
+    "2.21"
   ]
 }