version bump
fixed merge conflict
fixed class/module discrep