fixed up merge txt