get ready for step 2
Etapa 2, conflits fixed