add lua
merge