fix merge conflict
bump version 0.2.2