Cleaned up merge text