Settled JS file conflicts