resolve import conflict