fix merge conflicts
Merge pull request #4 from Codeinwp/development

fix merge conflicts