fix merge conflicts
Merge pull request #1 from aedwardsxula/Nikita

Adjust the Driver