Cleaned up merge problems.