Committing change to testfile.txt
Resolving merge conflict