premerge log funk
resiolving log
further refinement to router and other dependencies