Increment 4.1 version.
Fix conflicts.