add lua snippets
resolve merge conflict