Increment version.
Fix conflict.