Fixing some merge issues.