adding Marias page
resolving the conflict
updating after Maria's page