Version 1.2.2.
Fix conflicts.