cleaned up merge text