Added :uberjar-merge-with, which appears to have resolved TRUEVFS-117.