add ack merge
add ack merge