diff --git a/pkgs/plt-services/meta/drdr/pkgs.rktd b/pkgs/plt-services/meta/drdr/pkgs.rktd
index faec618bb9..7352cbe302 100644
--- a/pkgs/plt-services/meta/drdr/pkgs.rktd
+++ b/pkgs/plt-services/meta/drdr/pkgs.rktd
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
-()
-=======
 (("planet2-example" "https://github.com/jeapostrophe/planet2-example/")
  #;("games" "git://github.com/racket/games/"))
->>>>>>> Install, build, and test specified pkgs in DrDr.