fix merge mistake in user.js