Increment version.
Fix conflicts.