on upload only skip conflicts when skip option is present.

Oops https://github.com/kanso/kanso/pull/413

Pushing this to npm as 0.3.4.
bumped version