Cleanup after merge conflict on issue #218