Fixes merge issues?

[tig]

I think.

[tig]

Trying to fix this all now.

[tig]

@BDisp Please carefully check that I didn't undo any of your fixes that matter. I think this finally brings all of this together.

[BDisp]

@tig this is equal to mine after merge and really some of fixes was undo. I already fix all merge errors. I can run it but some unit tests are failing. I'll push my changes to my PR to you also check, please.

[tig]

@tig this is equal to mine after merge and really some of fixes was undo. I already fix all merge errors. I can run it but some unit tests are failing. I'll push my changes to my PR to you also check, please.

It's not completely equal because all unit test pass. However, in gui-cs#2385, unit tests are failing.

[tig]

Note, I was very careful to do each change as a separate commit, so hopefully that will help figure out what I actually fixed vs. just duplicated.