Resolve conflicts prior to merge pull request #2.