BEIJING - China and Taiwan said Tuesday they have resolved a row over a deadly boat incident in February near the remote Taiwanese island of Kinmen, with the return of the bodies of two mainland fishermen and the payment of condolence money collected from the private-sector.