fixed merging problem + added the correct dll