resolve import conflicts