After the dispute between the two sides