diff --git a/ChangeLog b/ChangeLog
index 2b22f48c3d..059cb1e6db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,17 @@
+<<<<<<< .mine
+Thu Sep 20 10:56:08 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/drb/ut_drb.rb: revert a part of r36987, and get rid of a warning
+	  with another method.  if the substitution is removed, the ExtSrv
+	  object will be GC'ed and some tests will be blocked.
+
+=======
 Thu Sep 20 10:30:00 2012  Zachary Scott  <zzak@ruby-lang.org>
 
 	* lib/find.rb: Error in documentation example
 	  Found by Herwin Weststrate, thank you!
 
+>>>>>>> .r36994
 Thu Sep 20 07:20:00 2012  Zachary Scott  <zzak@ruby-lang.org>
 
 	* complex.c: Examples for Complex Documentation.
diff --git a/test/drb/ut_drb.rb b/test/drb/ut_drb.rb
index da4ca10791..c6cc0590f1 100644
--- a/test/drb/ut_drb.rb
+++ b/test/drb/ut_drb.rb
@@ -157,6 +157,7 @@ if __FILE__ == $0
   DRb::DRbServer.default_argc_limit(8)
   DRb::DRbServer.default_load_limit(4096)
   DRb.start_service('druby://localhost:0', DRbEx.new)
-  DRb::ExtServ.new(ARGV.shift, ARGV.shift)
+  es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
   DRb.thread.join
+  es.stop_service if es.alive?
 end