add material js
fix merge