Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch master
 Your branch is behind 'origin/master' by 5 commits, and can be fast-forwarded.
   (use "git pull" to update your local branch)

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

	modified:   src/Distortion/TestSources.cpp
	modified:   src/Distortion/TestSources.h
Merge branch 'master' of https://github.com/ALX5/PJS

Conflicts:
	src/Distortion/TestSources.cpp

 It looks like you may be committing a merge.
 If this is not correct, please remove the file
	.git/MERGE_HEAD
 and try again.

 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch master