handle different branch imports better