The unexpected move ends a seven-year rift between the two sides, but differences remain.