resolve conflict in functions.js
resolve conflict in functions.js