errors
working merged
semi final falta documentacion