Resolving git weirdness on Robot.java