local txt file conflict
local txt file conflict