added some resizing to conflicts ui