fixed punch merge issue