Align code
Group highlights
Add git diffs