[#817] Fix asset issues with post-merge hook