Fix merging changes in js files