Fix merge conflicts

Updating resources, test updates

StyleCI Cleanup

Apply fixes from StyleCI (mikeerickson#108)

Fixed merge conflicts and version mangling

updating version workflow

Version bump, issues with composer

Remove version string from composer.json, attempting to address packa…

…gist issue

Version bump

Fix mangled trait class definition