FiFixing merge conflict at contacto page
Fixes in contsaacto