I also tried merging it with no success.

My strategy, until someone pays more attention to this being an issue, is to just replace the file with the other to get my shop up and running.

Like you, I prefer to use all the updated files, but so far replacing this one file has been working for us through some busy busy months without fail. I'm sure it will be dealt with eventually by the mod creator.