add intro to the the first page:
resolve conflicts: