diff --git a/content/en/docs/Learning Resources/Blog Posts/_index.md b/content/en/docs/Learning Resources/Blog Posts/_index.md
index c2479a0..8f7aaee 100644
--- a/content/en/docs/Learning Resources/Blog Posts/_index.md	
+++ b/content/en/docs/Learning Resources/Blog Posts/_index.md	
@@ -9,5 +9,8 @@ description: >
 * [Apache Parquet: Cost Efficiency @ Scale in Big Data File Format](https://eng.uber.com/cost-efficiency-big-data/)
 
 * [One Stone, Three Birds: Finer-Grained Encryption @ Apache Parquet](https://eng.uber.com/one-stone-three-birds-finer-grained-encryption-apache-parquet/)
+<<<<<<< HEAD
 
 * [Designing a Parquet Catalog for InfluxDB IOx](https://www.influxdata.com/blog/designing-a-parquet-catalog-for-influxdb-iox/)
+=======
+>>>>>>> refs/remotes/origin/staging