get ready for step 1
Conflits of Etapa 1 fixed