another conflict fixed