add ack and coulpe more things
fix merge