Fix dangling merge conflict
Merge pull request #136 from jeckhart/fix-merge-conflict

Fix dangling merge conflict