First Example initial version
rubbish 2
Revert "rubbish 2"

This reverts commit b5c77b25757705a51b0e6bea95c7de20ce50ea74.
new value in example1.txt
added another example1.txt to generate merge conflict
conflict resolved