resolved another conflict