Fix "util not defined" error from merge conflict