couple of fixes - assert state dir not inside merging dirs