primary merge of the 2 chapters in one long format