change master.js
conflict fixed