I tend to use repeated import statements to make them fully independent of one another and hence limit the chances of conflicts when working in long running branches. But I don't really mind either.