para que se quite el error
Merge remote-tracking branch 'origin/master'

Conflicts:
	DeliveriandoWebApp/js/index.js