Rather than having to do a file merge I've pulled out the bits to edit in each file.

I've not put in line numbers as my base store is so heavily modified it'd be a waste of time but a simple find/replace will pull up all the necessary bits to change.

Install File attached.

More...