Use irbtools.
Fix merge conflicts.