Fixing merge for drive_over code