Fix merge weirdness
Merge pull request #1 from wesbillman/fix-merge

Fix merge weirdness