Resolve merge conflict in PR #225

Fixes PR #225