Errores de Merge Solucionados
Merge remote-tracking branch 'origin/Aitor'