Fix for merge conflict introduced in README