first pages commit
resolving conflitos