fixed bad merge in common.js