now actually resolves conflicts
version bump