Fix merge problems with client_globals.js