Update testDeliberateMergeConflict.txt

add a change made in the github web gui