First pages commit
added a new line
Fixing conflicts