fix conflicts
Merge pull request #7 from FinalAngel/fixes/2514

fix conflicts