solving more conflicts