So... merging is done. There's some more commented text I want to reinsert with the classic switch, but it's more of a lower priority now as the most important texts have been merged.
There's still a lot to do but the tedious part is done. Next on the list:
1) Fix HD support - there are a couple of broken scenes in HD, though other than that the game works as intended.
2) Divide the game to separate patches - while merging I also merged all the patches to make the workflow easier, but it's time to separate them once again.
3) Bug fixing.
The list doesn't end here but those are the top 3. When I've finished with the first two and fixed the more critical bugs I'll release a beta version.