diff --git a/root/etc/e-smith/templates/etc/clamrt.list/00setup b/root/etc/e-smith/templates/etc/clamrt.list/00setup
index cb86f2f..fd6925e 100644
--- a/root/etc/e-smith/templates/etc/clamrt.list/00setup
+++ b/root/etc/e-smith/templates/etc/clamrt.list/00setup
@@ -3,12 +3,9 @@
 use esmith::AccountsDB;
 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');
+@ibays = $a->ibays();
+@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 7f6ad9a..b79775a 100644
--- a/root/etc/e-smith/templates/etc/clamrt.list/10shares
+++ b/root/etc/e-smith/templates/etc/clamrt.list/10shares
@@ -6,9 +6,5 @@ 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 0d16d04..ac47154 100644
--- a/root/etc/e-smith/templates/etc/clamrt.list/20ibays
+++ b/root/etc/e-smith/templates/etc/clamrt.list/20ibays
@@ -6,9 +6,5 @@ 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/30netlogon b/root/etc/e-smith/templates/etc/clamrt.list/30dummy
similarity index 61%
rename from root/etc/e-smith/templates/etc/clamrt.list/30netlogon
rename to root/etc/e-smith/templates/etc/clamrt.list/30dummy
index c6642e5..1bf9dda 100644
--- a/root/etc/e-smith/templates/etc/clamrt.list/30netlogon
+++ b/root/etc/e-smith/templates/etc/clamrt.list/30dummy
@@ -1,4 +1,4 @@
 {
 # Just a dummy rep so there's always a rep to watch
 }
-/home/e-smith/files/samba/netlogon
+/var/lib/clamrt
diff --git a/smeserver-clamrt.spec b/smeserver-clamrt.spec
index 2c169c6..6711fe0 100644
--- a/smeserver-clamrt.spec
+++ b/smeserver-clamrt.spec
@@ -2,14 +2,10 @@
 # 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
+%define release 1.beta3
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -35,7 +31,7 @@ Provides on access AV scan for shares and ibays
 
 %build
 perl createlinks
-%{__mkdir_p} root/var/log/clamrt
+%{__mkdir_p} root/var/{log,lib}/clamrt
 
 %install
 /bin/rm -rf $RPM_BUILD_ROOT