Resolve conflict

diff --cc config/nagios-master.cfg
index 03a9769,4641cb5..4fcb4e9
--- 1/config/nagios-master.cfg
--- 2/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@@ -522,7 -522,8 +522,7 @@@ servers
    escher:
      address: 213.188.99.215
      parents: gw-cst
-     hostgroups: computers, single-cpu, hasbootfs, hasvarfs
 -    hostgroups: computers, single-cpu, hasbootfs, lenny, puppet
 -
++    hostgroups: computers, single-cpu, hasbootfs, lenny, puppet, hasvarfs
    goedel:
      address: 213.188.99.214
      parents: gw-cst