Update CHANGELOG to resolve merge conflicts

Author: kushalbakshi

CHANGELOG.md

@@ -6,12 +6,18 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
 ## [0.2.2] - Unreleased
 
 + Bugfix - Update docstrings to render API for documentation website.
-## [0.2.1] - Unreleased
 
+## [0.2.1] - 2022-01-06
+
++ Add - `build_electrode_layouts` function in `probe.py` to compute the electrode layout for all types of probes.
++ Update - parameterize run_CatGT step from parameters retrieved from `ClusteringParamSet` table
 + Update - clustering step, update duration for "median_subtraction" step
 + Bugfix - handles single probe recording in "Neuropix-PXI" format
 + Update - safeguard in creating/inserting probe types upon probe activation
 + Add - quality control metric dashboard
++ Update & fix docstrings
++ Update - `ephys_report.UnitLevelReport` to add `ephys.ClusterQualityLabel` as a foreign key reference
++ Add - `.pre-commit-config.yaml`
 
 ## [0.2.0] - 2022-10-28