fix jwc merge