Adding numbering and notes for branching and merging