Okay, so now I have version control running and I can (mostly) merge things together.

Two things actually:
1) My CK now crashes. A LOT.
2) Sometimes things look like they are merging just fine, but when I look at the esm, nothing happened. Or sometimes certain records just don't transfer over for some reason. Weird.