diff --git a/envs/environment-cpu.yml b/envs/environment-cpu.yml
index 5ba25eb8..2e99c24c 100644
--- a/envs/environment-cpu.yml
+++ b/envs/environment-cpu.yml
@@ -18,12 +18,8 @@ dependencies:
   # Tools to work with crystalline and molecular data
   - openbabel==3.1.*
   - rdkit==2023.03.2
-<<<<<<< HEAD
-  - pymatgen==2023.7.17
-=======
   - pymatgen==2023.8.10
   - scikit-learn==1.3.0
->>>>>>> 6351ca4586a6d5068859d4e220549a30643f51de
 
   # Use Conda PyTorch to avoid OpenMP disagreement with other libraries
   - pytorch==1.13.*