Tweaked code for competition robot
Fixed Git conflict