Fixing stupid problems.  Merging isn't fun