añadí {}
Merge remote-tracking branch 'origin/master'Conflicts:	script.js