Two different types of conflict that occurred in the 19th century