repair a mistake in 1.lua
show message
new message in 1.lua
conflict fixed
chang again
fixed
fixed