diff --git a/3proxy.cfg b/3proxy.cfg
index 1c038ac..27a353f 100644
--- a/3proxy.cfg
+++ b/3proxy.cfg
@@ -175,4 +175,8 @@ admin
 # now we needn't any root rights. We can chroot and setgid/setuid.
 
 
+<<<<<<< HEAD
+###$Id: 3proxy.cfg,v 1.1 2009/08/27 20:43:43 hubbitus Exp $#######
+=======
 ###$Id: 3proxy.cfg.sample,v 1.5 2004/07/16 12:37:20 vlad Exp $#######
+>>>>>>> origin/master