conflict error has been resolved in common.js