fixed merge issue
changes to rc.lua