fixes de layout
fix conflict