import conflict solved