Committing a change to testfile.txt
Resolving merge conflict