Fix merge conflicts with previous version
Fix merge conflicts with previous version


Former-commit-id: a446732c19a0fad50d0532948253a3b328bd12e3
valkyrierobotics/vision2017,valkyrierobotics/vision2017,valkyrierobotics/vision2017