Fixed up merge issues.