Resolving the China-Japan Dispute Over the Senkaku Islands