silent kill, fixed merge error