Merge Madness

I’m still working through the problems with this merged code I’ve been sweating over for the last two weeks!

I’m getting punch drunk now; every time I fix one problem, I move on a step only to find another.
It seems to have been going on for ever. Some days I don’t get to leave the house. *sob*