removes tiny merge conflict thing
Merge pull request #11 from quackhouse/fixing_isotope

removes tiny merge conflict thing