conflict solved 2