Delete some merge conflict relics
Delete some merge conflict relics

CultivateLabs/storytime,matiasgarcia/storytime,braindeaf/storytime,bidah/storytime,CultivateLabs/storytime,harrykiselev/storytime,hoanghiep90/storytime,matiasgarcia/storytime,bidah/storytime,bidah/storytime,hoanghiep90/storytime,braindeaf/storytime,hoanghiep90/storytime,harrykiselev/storytime,harrykiselev/storytime,braindeaf/storytime,matiasgarcia/storytime,CultivateLabs/storytime,FlyoverWorks/storytime,FlyoverWorks/storytime,bidah/storytime-manentail,bidah/storytime-manentail,FlyoverWorks/storytime,bidah/storytime-manentail