rsync fixes to merge scripts