Fixing some merge problems.