Fix the rebase conflicts
Fix the rebase conflicts

Immington-Industries/way-cooler,Immington-Industries/way-cooler,way-cooler/way-cooler,way-cooler/way-cooler,Immington-Industries/way-cooler,way-cooler/way-cooler