[tuxtxt] fix merge error