Revert to markers for armed conflict data, add a button to toggle between the two