The two sides have finally___________,though some small diff