Resolve merge conflict for pull request #13