Solved ack conflicts