Xi Jin Ping could settle both conflicts tomorrow