resolve merging conflicts
resolve merging conflicts

ruwany/carbon-device-mgt,rasika/carbon-device-mgt,rasika90/carbon-device-mgt,hasuniea/carbon-device-mgt,Kamidu/carbon-device-mgt,charithag/carbon-device-mgt,madhawap/carbon-device-mgt,madawas/carbon-device-mgt,hasuniea/carbon-device-mgt,dilee/carbon-device-mgt,ruwany/carbon-device-mgt,dilee/carbon-device-mgt,geethkokila/carbon-device-mgt,Kamidu/carbon-device-mgt,charithag/carbon-device-mgt,madawas/carbon-device-mgt,charithag/carbon-device-mgt,dilee/carbon-device-mgt,geethkokila/carbon-device-mgt,rasika/carbon-device-mgt,wso2/carbon-device-mgt,Kamidu/carbon-device-mgt,rasika90/carbon-device-mgt,rasika90/carbon-device-mgt,wso2/carbon-device-mgt,rasika/carbon-device-mgt,madhawap/carbon-device-mgt,geethkokila/carbon-device-mgt,wso2/carbon-device-mgt,madhawap/carbon-device-mgt,madawas/carbon-device-mgt,ruwany/carbon-device-mgt,hasuniea/carbon-device-mgt