try to resolve conflicts

src/kernel.h

@@ -51,12 +51,12 @@ private:
 
 private:
 	// do not change this order
-	CConfig			m_Config;
+	CConfig		m_Config;
 	CCPUThrottle	m_CPUThrottle;
 	CGPIOManager	m_GPIOManager;
-	CI2CMaster		m_I2CMaster;
+	CI2CMaster	m_I2CMaster;
-	CMiniDexed		*m_pDexed;
+	CMiniDexed	*m_pDexed;
-	CUSBController 	*m_pUSB;
+	CUSBController *m_pUSB;
 
 	static CKernel *s_pThis;
 };

src/minidexed.cpp

@@ -60,7 +60,6 @@ CMiniDexed::CMiniDexed (CConfig *pConfig, CInterruptSystem *pInterrupt,
 	m_bSetNewPerformance (false),
 	m_bDeletePerformance (false),
 	m_bLoadPerformanceBusy(false),
-
 	m_pNet(nullptr),
 	m_pNetDevice(nullptr),
 	m_WLAN(WLANFirmwarePath),