re-order js to solve conflict