I see merge conflicts. Do you see them too? If not, tell me, and I will show them to you. I wonder how this can happen, since nobody else made changes in your files.
It is time that you add your name to the AUTHORS file in the main directory. Could you add this to this pull request?
Changes in: Makefile.am New unit test: exampleTest