Fixed error message in Gauge View Controller.
Fixed merge conflicts.