Generate item adapter in the tabs
Fix conflicts