update to use new API, bump -> 0.2.0
resolve merge conflict