fixed merge conflict in Robot.java