Updated Chrisjenkins.txt
Resolved conflict