Bump version in readme.
Resolve conflicts.
Update packge.