Fixed missing argument as a result of bad merge conflict