I find git resolving conflicts, merge pretty funky

Anyway, fixing 1 Fourier mode did not work for us, but proof is in the
pudding.
If you get symmetry reduced dynamics of the 2-mode model this way, let's
see where it gets us?