add heyman
fixed merge