Conflicted DLL root folder fix and DLL version increment