Middle C color setting per split and Column Offset setting 1-4 semitones per column

I have two relatively simple ideas/suggestions implemented here.

1) highlight Middle C with its own distinct color per split to give users a clear visual indication of the scale and octave settings. I utilized an additional row (3) of the split color settings column (11) for this, and MIDI NRPN 40 (left split) and 140 (right split).

2)  global column offset, very much like the existing row offset, to give a little more flexibility in the mapping of notes to grid cells on the playing surface (1 to 4 semitones per column). I utilized global settings column 19 for selecting offset values and NRPN 250.

I also extended the bend range setting with two more values 48 and 96 to better match the options of some apps developed for Haaken Continuum and default settings in Logic Pro MIDI Mono Mode.

Unfortunately, I have been struggling with github and the changes I intended to make seem to have been obscured by my attempts to update my fork with your upstream development. I evidently did that merge wrong judging by the history of changes and the network graph, although the resulting source code looks like it might actually be uptodate. Can I somehow rewind and bring it forward cleanly? Or am I looking at it all wrong? How should I proceed with future updates to my fork?

I would appreciate any basic guidance