Edit JS Conflict