first pages commit
conflict fixed