The old 1.2 version (TATW 3.1) has been re-added to the OP.
The 1.3.1 versions are identical in their "switcher" content: if the manual merge one isn't working and the vanilla one is then it must be because your merging wasn't done correctly. Or you're using it on a 3.1 install, which sounds likely given your mention of "Barons". I'm not sure why that would crash the game but it's possible.
So, in summary:
For TATW 3.1 use 1.2.
For TATW 3.2 use 1.3.1.
If 1.3.1 manual merge on a 3.2 game is crashing then it must be due to a merging error. Check the 1.3.1 vanilla files to see where things have been inserted.
If it still isn't working then attach your manually-merged files here and I'll see if I can spot the problem.