my first js
change the conflicts