diff --git a/Project.toml b/Project.toml
index 8679c66..825cc3b 100644
--- a/Project.toml
+++ b/Project.toml
@@ -12,11 +12,8 @@ ChainRulesTestUtils = "cdddcdb0-9152-4a09-a978-84456f9df70a"
 Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
 HyperDualNumbers = "50ceba7f-c3ee-5a84-a6e8-3ad40456ec97"
-<<<<<<< HEAD
 JLD = "4138dd39-2aa7-5051-a626-17a0bb65d9c8"
-=======
 IterativeSolvers = "42fd0dbc-a981-5370-80f2-aaf504508153"
->>>>>>> parallel_mc
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 LinearMaps = "7a12625a-238d-50fd-b39a-03d52299707e"