some changes, many difficults, and app doesnt ok to the presentation
Conflics and erros to solve