add remote files, merge, and comment out moutning utility02 on the heads

diff --cc templates/eg_fstab_head
index abc6f9e,5ccd800..2a25f3d
--- 1/templates/eg_fstab_head
--- 2/templates/eg_fstab_head
+++ b/templates/eg_fstab_head
@@@ -1,6 -1,4 +1,9 @@@
  ## NFS Mounts for Evergreen.
  UTILITY01_IP:/openils/var/data/offline /openils/var/data/offline/ nfs rw 0 0
  UTILITY01_IP:/openils/var/data/vandelay /openils/var/data/vandelay/ nfs rw 0 0
++<<<<<<< HEAD
 +#UTILITY02_IP:/openils/var/data/offline /openils/var/data/offline/ nfs rw 0 0
 +#UTILITY02_IP:/openils/var/data/vandelay /openils/var/data/vandelay/ nfs rw 0 0
++=======
++>>>>>>> 96b0548a13f5d6aa30dadcbdd9d08dfaa069bffa
  REPORTER_OUTPUT_NFS_HOST_IP:/storage/reports-output /openils/var/web/reporter/ nfs rw 0 0