ScriptMerger is not able to automatically merge both versions of this file when you have the mods "Improved Time Skip" and "Buff Charges (Grindstone and Workbench Only)" installed, nor is it simple for your average-to-advanced end user in kdiff3 when it comes up, so I pored over the two scripts in Notepad++ until I had a handle on it, and made the necessary changes so that now you get the best of both mods.

To use this, first install both of those mods, find the "effectManager.ws" script in each of the mod subfolders, and either replace both of them with this file, or else delete one and replace the other (doesn't matter which).  Make sure and re-merge your scripts if you had previous merges which affected this script.