diff --git a/Project.toml b/Project.toml
index 326561f..d676f3d 100644
--- a/Project.toml
+++ b/Project.toml
@@ -50,7 +50,11 @@ DSP = "0.6, 0.7"
 DocStringExtensions = "0.8, 0.9"
 ElasticArrays = "1"
 FFTW = "1"
+<<<<<<< HEAD
 FillArrays = "0.13,  1"
+=======
+FillArrays = "0.13.8, 1"
+>>>>>>> 0d616cd (Set lower bound of FillArrays to 0.13.8)
 FunctionChains = "0.1"
 GPUArraysCore = "0.1, 0.2"
 IntervalSets = "0.7"