What two countries were already involved in a military conflict before the beginning of World War II?

Japan and China were already engaged in a military conflict before the outbreak of World War II. China was also involved in a civil war and spent most of World War II dealing with internal conflicts and repelling the advances of the Japanese.