support for lua 5.2
fix merge conflict