working js
fix merge conflicts