fixed merge conflict marker in jscsrc