Conflict and development