Add mail support on merge error