I have a plan to help them fit in the table, and regrouping them will
make matters simpler.

Much better diff with the --patience option.