Also adding a line to testing.txt.  This should cause a conflict.
Resolve conflict between master and origin/master