fix merge conflicts
Merge pull request #143 from taylorharwin/fix-merges

Fix merges