added missing chapter number
fixing conflicts
added going further chapter