Only rm file if it xists  prevent error
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-diamond.git