Fixing a merge clash in .lua