estilos
merge
solved typo