fix bad merge
Merge pull request #395 from Kenny9999/development

fix bad merge