Recomited first stage js file
Conflict decision