diff --git a/createlinks b/createlinks
index 93209be..4727a20 100644
--- a/createlinks
+++ b/createlinks
@@ -6,3 +6,10 @@ foreach my $event (qw/bootstrap-console-save share-modify ibay-modify/){
     templates2events("/etc/clamrt.list", $event);
     safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/clamrt");
 }
+<<<<<<< HEAD
+=======
+safe_touch("root/var/service/clamrt/down");
+safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/clamrt');
+safe_symlink("/var/service/clamrt" , 'root/service/clamrt');
+
+>>>>>>> c99401afc73e86cc62d04be2dab94651b24af879
diff --git a/root/etc/e-smith/templates/etc/clamrt.list/00setup b/root/etc/e-smith/templates/etc/clamrt.list/00setup
index affb737..cb86f2f 100644
--- a/root/etc/e-smith/templates/etc/clamrt.list/00setup
+++ b/root/etc/e-smith/templates/etc/clamrt.list/00setup
@@ -6,4 +6,9 @@ my $a = esmith::AccountsDB->open_ro || die "Couldn't open AccountsDB\n";
 my @ibays = $a->ibays();
 my @shares = $a->get_all_by_prop(type=>'share');
 
+<<<<<<< HEAD
+=======
+$OUT .= '';
+
+>>>>>>> c99401afc73e86cc62d04be2dab94651b24af879
 }
diff --git a/root/etc/e-smith/templates/etc/clamrt.list/10shares b/root/etc/e-smith/templates/etc/clamrt.list/10shares
index 5da45c8..7f6ad9a 100644
--- a/root/etc/e-smith/templates/etc/clamrt.list/10shares
+++ b/root/etc/e-smith/templates/etc/clamrt.list/10shares
@@ -6,5 +6,9 @@ foreach my $share (@shares){
     next unless ($av eq 'enabled');
     $OUT .= "/home/e-smith/files/shares/$name/files\n";
 }
+<<<<<<< HEAD
 
+=======
+$OUT .= '';
+>>>>>>> c99401afc73e86cc62d04be2dab94651b24af879
 }
diff --git a/root/etc/e-smith/templates/etc/clamrt.list/20ibays b/root/etc/e-smith/templates/etc/clamrt.list/20ibays
index 4d56142..0d16d04 100644
--- a/root/etc/e-smith/templates/etc/clamrt.list/20ibays
+++ b/root/etc/e-smith/templates/etc/clamrt.list/20ibays
@@ -6,5 +6,9 @@ foreach my $ibay (@ibays){
     next unless ($av eq 'enabled');
     $OUT .= "/home/e-smith/files/ibays/$name\n";
 }
+<<<<<<< HEAD
 
+=======
+$OUT .= '';
+>>>>>>> c99401afc73e86cc62d04be2dab94651b24af879
 }
diff --git a/root/etc/e-smith/templates/etc/clamrt.list/30tmp b/root/etc/e-smith/templates/etc/clamrt.list/30netlogon
similarity index 61%
rename from root/etc/e-smith/templates/etc/clamrt.list/30tmp
rename to root/etc/e-smith/templates/etc/clamrt.list/30netlogon
index 44acdf7..c6642e5 100644
--- a/root/etc/e-smith/templates/etc/clamrt.list/30tmp
+++ b/root/etc/e-smith/templates/etc/clamrt.list/30netlogon
@@ -1,4 +1,4 @@
 {
 # Just a dummy rep so there's always a rep to watch
 }
-/tmp
+/home/e-smith/files/samba/netlogon
diff --git a/root/etc/e-smith/templates/etc/clamrt.list/template-begin b/root/etc/e-smith/templates/etc/clamrt.list/template-begin
new file mode 100644
index 0000000..e69de29
diff --git a/smeserver-clamrt.spec b/smeserver-clamrt.spec
index 74f29af..2c169c6 100644
--- a/smeserver-clamrt.spec
+++ b/smeserver-clamrt.spec
@@ -2,7 +2,11 @@
 # Name: Daniel B.
 
 Summary: On access AV scanner
+<<<<<<< HEAD
 %define name smeserver-webapps-common
+=======
+%define name smeserver-clamrt
+>>>>>>> c99401afc73e86cc62d04be2dab94651b24af879
 Name: %{name}
 %define version 0.0.1
 %define release 1.beta0