The border conflict that has killed at least 33 people and displaced more than 150,000 from their homes.