Merged conflicts, in pull request #25