Texture Pack Merger

Upload two or more resource pack zips and merge them into a single pack, with a conflict log showing exactly which pack's file overwrote which.