fixed merge conflict in driver.java