diff --git a/shell.nix b/shell.nix
index 79b645fac..088fb8e3c 100644
--- a/shell.nix
+++ b/shell.nix
@@ -57,11 +57,7 @@ in
       mkdir -p $GOBIN
       export PATH=$GOBIN:$PATH
       # install gotestloghelper
-<<<<<<< Updated upstream
       # TODO restore latest after versioning is fixed
       go install github.com/smartcontractkit/chainlink-testing-framework/tools/gotestloghelper@bb160ff1069a807693b2c76691c55cb17959fbb5
-=======
-      go install github.com/smartcontractkit/chainlink-testing-framework/tools/gotestloghelper@latest
->>>>>>> Stashed changes
     '';
   }