fixed mergers

diff --cc plugins/dbus/properties.h
index c0255a0,9e7d1e0..2276d4d
--- 1/plugins/dbus/properties.h
--- 2/plugins/dbus/properties.h
+++ b/plugins/dbus/properties.h
@@@ -27,7 -27,7 +27,7 @@@ class VehicleSpeedProperty: public DBus
  {
  public:
        VehicleSpeedProperty(AbstractRoutingEngine* re, GDBusConnection* connection)
-               :DBusSink("org.automotive.vehicleSpeed","/org/automotive/vehiclespeed", re, connection, map<string, string>())
 -              :DBusSink("org.automotive.vehicleSpeed","/org/automotive/runningstatus/vehiclespeed", re, connection)
++              :DBusSink("org.automotive.vehicleSpeed","/org/automotive/runningstatus/vehiclespeed", re, connection, map<string, string>())
        {
                wantProperty<uint16_t>(VehicleProperty::VehicleSpeed,"VehicleSpeed", "i", AbstractProperty::Read);
                supportedChanged(re->supported());

diff --cc plugins/wheel/wheelplugin.cpp
Simple merge