make it compile again after resolving merge conflicts
make it compile again after resolving merge conflicts

dennisweissmann/Basics,dennisweissmann/Basics,dennisweissmann/DeviceKit,dennisweissmann/DeviceKit,dennisweissmann/DeviceKit,dennisweissmann/DeviceKit