merge conflict fix
Merge pull request #1484 from jlsherrill/conflict-fix

merge conflict fix