Fixed merge conflicts, initial pages