The worst fighting in years between the two neighbours killed at least 41 people, mostly civilians, and displaced more than 300,000 others.