fixing another merge conflict
version bump to 0.2.1