What is the difference between ethnic conflict and genocide?

ethnic conflict is the war between ethinic groups,like the native americans and the europeans and genocide is the killing of an ethinic group, like the Holocaust