First pages commit
Fixed conflicts