Generate a correct and concise answer for the question based on the words in the context.
Q: Context : Count Fyodor Keller (Russian: ; 1850 - 31 July 1904) was a general in the Imperial Russian Army, noted for his role in the Battle of Motien Pass during the Russo-Japanese War.
Question : Which conflict was Fyodor Keller a part of?
A:
Russo-Japanese War