Fixed issue with exports on root account.
Clean definitions cache when doing "sofin distclean".
Better info in conflict resolve code.