[#817] Updated post-merge hook

Need input on the .jsx -> .js files. Not sure if they should be hidden or added to git.