js_tests Merge conflict in DrawSpec resolved