Add JS test and fix merge conflict.