Fix JS file conflicts