Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   helloworld.py
 On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   helloworld.py
Merge branch 'testing'

Test merge.