Fix missing import
Fix Merge issues
Add PromoKit